Skip to content

upgrade sdk and kubebuilder for openshift 4.17 #645

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 5 commits into from
Mar 20, 2025
Merged

upgrade sdk and kubebuilder for openshift 4.17 #645

merged 5 commits into from
Mar 20, 2025

Conversation

rsoaresd
Copy link
Contributor

@rsoaresd rsoaresd commented Mar 18, 2025 •
edited
Loading

Description

We already did the first phase of PRs to upgrade the dependencies for openshift 4.17. Now the second phase is to actually upgrade operator-sdk and kubebuilder. The following docs were followed:

Tool/Library Current Version Updates to Version
Operator SDK 1.36 1.38
kubebuilder v3 v4

Related PRs:

Issue ticket number and link

SANDBOX-808

rsoaresd
rsoaresd commented Mar 18, 2025
View reviewed changes
make/run-cicd-script.mk Outdated
@@ -1,4 +1,4 @@
OWNER_AND_BRANCH_LOCATION=codeready-toolchain/toolchain-cicd/master
OWNER_AND_BRANCH_LOCATION=rsoaresd/toolchain-cicd/openshift_4_17_cicd
Copy link
Contributor Author

@rsoaresd rsoaresd Mar 18, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

temporary until codeready-toolchain/toolchain-cicd#136 is merged / ensure that nothing breaks

config/samples/kustomization.yaml
@@ -1,4 +1,5 @@
## Append samples you want in your CSV to this file as resources ##
resources:
- toolchain.dev.openshift.com_v1alpha1_useraccount.yaml
Copy link
Contributor Author

@rsoaresd rsoaresd Mar 18, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"dummy" file because without it was failing with:

Error: accumulating resources: accumulation err='accumulating resources from '../samples': '/Users/rsoaresd/member-operator/config/samples' must resolve to a file': couldn't make target for path '/Users/rsoaresd/member-operator/config/samples': kustomization.yaml is empty

Copy link
Contributor

@alexeykazakov alexeykazakov Mar 18, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this /samples/ thing doesn't really applied anyway, right? IT's more for documentation purposes?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, they serve as "examples of Custom Resources that can be applied to the cluster"

@rsoaresd rsoaresd mentioned this pull request Mar 18, 2025
Merged
@rsoaresd rsoaresd mentioned this pull request Mar 18, 2025
Merged
@codecov Codecov
Copy link

codecov bot commented Mar 18, 2025 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 80.69%. Comparing base (04e5ca3) to head (db2ada7).
Report is 2 commits behind head on master.

Additional details and impacted files 
@@            Coverage Diff             @@
##           master     #645      +/-   ##
==========================================
+ Coverage   76.02%   80.69%   +4.66%     
==========================================
  Files          46       45       -1     
  Lines        4476     4217     -259     
==========================================
  Hits         3403     3403              
+ Misses        923      664     -259     
  Partials      150      150

see 1 file with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

alexeykazakov
alexeykazakov approved these changes Mar 18, 2025
View reviewed changes
Copy link
Contributor

@alexeykazakov alexeykazakov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Just don't forget to update OWNER_AND_BRANCH_LOCATION=rsoaresd/toolchain-cicd/openshift_4_17_cicd before merging! :)

mfrancisc
mfrancisc approved these changes Mar 19, 2025
View reviewed changes
Copy link
Contributor

@mfrancisc mfrancisc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good 👍 Thank you!

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Mar 20, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alexeykazakov, fbm3307, metlos, mfrancisc, rsoaresd

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [alexeykazakov,fbm3307,metlos,mfrancisc,rsoaresd]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@rsoaresd rsoaresd changed the title upgrade sdk and kubebuilder upgrade sdk and kubebuilder for 4.17 Mar 20, 2025
@rsoaresd rsoaresd changed the title upgrade sdk and kubebuilder for 4.17 upgrade sdk and kubebuilder for openshift 4.17 Mar 20, 2025
@rsoaresd
Copy link
Contributor Author

/retest

it seems flaky test

        ----
        diffs:
        expected Space to match the state label value: pending 
        actual labels: map[toolchain.dev.openshift.com/appstudio-tier-hash:943541ec40be180bc9cfe4751d3d3a76 toolchain.dev.openshift.com/state:cluster-assigned]
        expected conditions to match:
        
        expected:
        ----
        {Ready False 0001-01-01 00:00:00 +0000 UTC ProvisioningPending unspecified target member cluster <nil>}----
        actual:
        ----
        [{Ready True 2025-03-20 14:04:41 +0000 UTC Provisioned  <nil>}]----
        -expected
        +actual
          any(
        - 	v1alpha1.Condition{
        - 		Type:    "Ready",
        - 		Status:  "False",
        - 		Reason:  "ProvisioningPending",
        - 		Message: "unspecified target member cluster",
        - 	},
        + 	[]v1alpha1.Condition{
        + 		{
        + 			Type:               "Ready",
        + 			Status:             "True",
        + 			LastTransitionTime: s"2025-03-20 14:04:41 +0000 UTC",
        + 			Reason:             "Provisioned",
        + 		},
        + 	},
          )
        
        And having the LastTransitionTime 2025-03-20 14:08:39.754361931 +0000 UTC m=+413.421191829 or older

@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed Quality Gate passed

Issues
2 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
10.8% Duplication on New Code

See analysis details on SonarQube Cloud

@rsoaresd rsoaresd merged commit dd9d80e into codeready-toolchain:master Mar 20, 2025
12 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@metlos metlos metlos approved these changes

@alexeykazakov alexeykazakov alexeykazakov approved these changes

@mfrancisc mfrancisc mfrancisc approved these changes

@fbm3307 fbm3307 fbm3307 approved these changes

@MatousJobanek MatousJobanek Awaiting requested review from MatousJobanek

@xcoulon xcoulon Awaiting requested review from xcoulon

@rajivnathan rajivnathan Awaiting requested review from rajivnathan

@jrosental jrosental Awaiting requested review from jrosental

Assignees
No one assigned
Labels
approved
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@rsoaresd @metlos @alexeykazakov @mfrancisc @fbm3307